deploy: Only query bootloader if we have to make a loader change
authorColin Walters <walters@verbum.org>
Fri, 20 Sep 2013 02:25:12 +0000 (22:25 -0400)
committerColin Walters <walters@verbum.org>
Fri, 20 Sep 2013 02:25:12 +0000 (22:25 -0400)
This will also help distinguish in the output when we're just swapping
bootlinks versus when we need to change the loader config.

src/libostree/ostree-sysroot-deploy.c

index 34dbaf62439afadacc02ce637edaeca7e966ac4d..4639eadd08e81a4ac6030c12749603d0237bc696 100644 (file)
@@ -1016,7 +1016,6 @@ ostree_sysroot_write_deployments (OstreeSysroot     *self,
   gboolean ret = FALSE;
   guint i;
   gboolean requires_new_bootversion = FALSE;
-  gs_unref_object OstreeBootloader *bootloader = _ostree_sysroot_query_bootloader (self);
 
   g_assert (self->loaded);
 
@@ -1051,11 +1050,6 @@ ostree_sysroot_write_deployments (OstreeSysroot     *self,
         }
     }
 
-  if (bootloader)
-    g_print ("Detected bootloader: %s\n", _ostree_bootloader_get_name (bootloader));
-  else
-    g_print ("Detected bootloader: (unknown)\n");
-
   if (!requires_new_bootversion)
     {
       if (!full_system_sync (cancellable, error))
@@ -1075,6 +1069,13 @@ ostree_sysroot_write_deployments (OstreeSysroot     *self,
   else
     {
       int new_bootversion = self->bootversion ? 0 : 1;
+      gs_unref_object OstreeBootloader *bootloader = _ostree_sysroot_query_bootloader (self);
+
+      if (bootloader)
+        g_print ("Detected bootloader: %s\n", _ostree_bootloader_get_name (bootloader));
+      else
+        g_print ("Detected bootloader: (unknown)\n");
+      
       for (i = 0; i < new_deployments->len; i++)
         {
           OstreeDeployment *deployment = new_deployments->pdata[i];